Fix baseforms and remove duplicate analysis