[BUG][FIX][TEST] Morph adding/removing ( [er][et] [approved] made by ned and andreas and looks good cleanup )