Remove old code, add new code