Removed all unused classes