Remove companion objects. Exclusively use classOf