Removed more deferals