Removing unused classes
Adding comments