Removed more of the clips code