Should remove this much logging, no?