Removed useless code & classes