makefilegen cleanup (before adding more features)