lot of cleanup et all