Removed some unnecessary outcommented old code lines