Cleanup before PR