Cleanup: Remove commented/unused code.