Got rid of excess code commented out.