Small fixes to full and incremental
New cleanup script