Some cleanup

Removal of obsolete pieces