Warning and debug cleanup