Removed extraneous column logic fml