Merge "Refactor TISM add/remove code"