Remove some unused imports
Make sure we close our database sessions in a couple places
refs #2672