Remove more incubator references

Fixes JCLOUDS-388.