FLUID-5477: Removing more un-used extensions