Clean up some checks