Removing vestigial files and classes