(v0.9.6) Final cleanup for launch