Updated with 14.04 and removed some unnecessary bits