More code clean up attempting to debug.