Containerized use of tap. No external dependencies on ../util.
Remove references to external libs