Cleanup: remove unused code