code cleanup: remove unused code