Got rid of antiquated & useless class