cleanup: remove unneeded definitions