Tidy up imports
Performance improvement by reducing number of SQL queries executed.