clean the old code