cleanup: removed commented code