Remove possibly unnecessary intermediate class, which was an attempt at hiding some internals