Removed Source and Column
Removed Type