Using a better cleanup strategy
Current state of RELS-EXT migrating