Server code clean-up Fixed Effects
Client code clean-up Fixed Effects