And cleaning up

did not really do anything