cleanup
removed commented code