Post 0.9 cleanup

Just a bit of cleanup.