Silence warning
Move things around
Remove instrumentation