Fix some steps
Clean up after location/organisation rename