Cleaning up changes from JCLOUDS-106