Final cleanup before development