Unnecessary class removed;