More commented out code that really needs to be deleted.