Update Dockerfile

Cleaning up unnecessary things and improving set up flow