Updating: revertring some effect-annotations