Minor changes to remove obsolete code