Removed DB columns. Minor tweaks