Cleanup

*Merge is annoying...