Removed unassasary classes