Reduce image size by 40MB

Remove upgrade and cleanup after installation to reduce image size.