Cleanup comments and unused classes