start cleaning old code