Cleanup in cpa.mk