Fixed changes to remove and skip templates

Removed all attributes from skip to remove.