Cleanup: removed commented code