removed unused code and cleaned up files with CodeMaid