Removing unused classes + tidy