Optimise imports, remove unused message class