Update dockerfile to do more cleanup