Completed Tyepmock remove phase