i927.mk cleanup