reduce dependencies, fix references