removed depreciated commented code.