remove old kludge for testing purposes