Drying up the vars and tags code

plus removal of old/empty files.