* Added warning in case of invalid combination of command and flags and/or arguments * Deleting unnecessary comments * Added separate list for generic options * Added PAT to the valid remove options * Added command name to the error message