Cleanup fluid syntax and removed dead code