Removed old list code, and renamed new list code, even though its not used anymore, either