Removed unnecessary class and datatoggles