remove unused files, fix variable overrides, changing name