Cleanup (incl adding profiles to project) so we can run from cmd line