removed some obsolete files, made name a variable