BalajiN | #49 | Removing unused classes