Only see fields assigned to template

Hi,

When I go and edit one of my templates, all fields show up in the core and user fields. Is there a way that I only see the user fields assigned to the template. I have for example two fields named image, which are used in different templates. Now I see two imagefields (image#21 and image#33) when editing template 'holiday' but only image#33 is assigned to that template, so I would like to NOT see image#21 field