Code CleanUp

some commented code has been removed