Remove orphaned code and class