commented code to make todo and removed unused classes