progress on rewrite; remove un-necessary .Error() on error