Removing from v3.0 release
minor tidy up/uncommenting