Server code cleaning.