Deleted now useless class in favour of generic