Code cleaning. Useless checks removed.