Cleanup, switch over to trace statements