Clean up

Look at the individual commits