removed 'ready' test from old, removed code