Cleaning up after myself

Please merge.