Some clean up

Nothing special