Use ubuntu-desktop as base image; clean-up
Remove redundant lines; rename