Removed explicit 'remove' calls on sets to use workout method.