working on, fixed excutor remove.