Cleaning requirements up and updating some packages used