Removing remaining async code