Removing surround and repeat never use them