Remove not needed sudo/openssh and some cleanup