Got rid of the 'Fragment' concept
Removing some more dead code