Updated probably useless cleanup