Clean up for 0.5.0 beta-b4