Little refactor. Removal works.