code cleanup: remove unneeded code