cleaned up manifest and removed unused classes