Remove StatefulMeasure
Fix binding import statements to get core tests to pass