Removed observers which was throwing errors, also improves performance