Removed code that has been commented out.