Remove guard:run method, so we can drop out additional table. #439