Cleanup for 0.9