Remove more defers that are not working