Move valid layers check together with the hygiene check