Unnecessary interfaces removed, minor DataUnit fixing, preparation for madeReadOnly removal