remove instance BUILD and DELETING states from code, fix tests