Removed some unnecessary data and methods