Little bit of cleaning up for 0.6.0 final