Comment out self check... for now