removed unnecessary class and fields