Cleanup before code review