Review the 14.04 squashed commit

[smesdaghi]

Make sure all changes are what they need to be and undo any thing that needs to be moved back. remove code not needed instead of commenting it out.