Removing unwanted class definition