Obsolete code commented out