FLUID-5284: Additional linting and clean up