Removed some outcommented code
Removed some dead code