Cleanup: removing old unused code