Cleanup: removing unused code