Removed more blocking code.