Removed observers which were throwing errors, also improves performance