Cleanup, preparing for merge