Updated with comments and removed old ubuntu setup