Fragments cleanup #691