Removed duplicate/conflicting code from a previous merge