Feature/intermediate removal