Eliminated behavior discovery code and deleted deprecated methods