before the big cleaning
cleaned up