Fixed phours command

Also removed import statements for unused classes
Removed unnecessary code
Beginning to implement group queries
Added FileCleaner