(v0.9.5) Final cleanup for launch