Cleanup for merging with master