Removed some outcommented code.