Clean up again

The the commits just keep on coming!