Removed some commendted code