fix: finished cleaning up errors