FLUID-5511: Final clean-up of unused/undesirable files