Adding legacy reprints fix, added comments, removed test code, #448