Cleaning up _DEBUG code