Removed unnecessary error-state integration