Classes should be removed only when adaptive is specified

This fixes a regression introduced in refactoring done on July 3rd.