[CONSRV]: Code cleaning.