Removed unused code and cleaned up project