I don't think we'll need this… I also think we should remove it from other modules.
@blkperl any opinion on that?