server models cleanup