refactor
removed clip
merge