removed code that is commented out