Clean up use of assertions