fixed typos/wrong list being used.
also deleted some unused code