Remove old code that has been commented out