Note to remove hack
Test clean up