Removing companion object in favour of single Imports.