removed conflicting classes