merge fix
fixed and linted
no longer used