Cleanup!

Few fixes and removal of unused classes and references!