Removed conflicting and irrelevant classes