Fragment-code cleanup