Removed Un-needed classes