Remove blocking code