Cleaned up the code

Deleted unused code and cleaned up the folder. Still needs to be tested