Cleanup: Remove unused code