Removing templates from this branch