Removed old Egraphs requirements. General code cleanup and fixing up of tests