Removed hard coded columns