Clean up common.mk