WIP -- Remove pedantic comment