removed class moved after refatoring.