fix typo
remove obsolate classes