increase text populator timeout
remove database merge facilities