More cleanup
Bumping  tested up to to 3.6-beta1