Finalized everything. Removed unused classes
Removing falsely added classes