remove extra imports
put proper scanner errors back in