Tidy up project and target configuration