clean up errors after refactor