Removed old blocking code