Removed unnecessary class variables