Cleanup code in fluid theme.

See diff & comment