add using of empty_setup
remove old code