Should removed classes become Undeclared?