Chore - removing old code