FLUID-5469: Removed commented out code

Also removed the assignment which isn't used.