After first cleanup...