Remove usage of non-existent class