removing unnecessary fields
unused imports
moving the command line tool into here since they have so much similar code