Removed All "-fluid" instances