Clean up
Changes to keep up with 0.6.6