refactoring octagon
remove
remove debug info