Clean up for v1.5 launch