A lot of cleanup

Intermediary push before deletes