core.mk cleanup