Remove globals from target-config