add customtargetsourcecreators and clean up