Removing clip dependency