removing useless class to flatten the hierarchy