Removed some unused imports from DB comm
Minor changes to some labels
Merge from master after re-establishing connection to github