Cleaning and maintainance

Cleaned unused code and updated the readme