Cleanups required before merging