Change this dockerfile to use new simpler location and cleanup.