Add condition to CupCake.targets
Cleanup CupCake.props