Cleaned up some unused code to avoid any confusion.