Cleanup Dockerfile

Change-Id: Idc40950b89d11f18012413e654155ac57b8b8f54