cleaning up branch 'errors'