update Dockerfile and cleanups