Removed a couple of traces :P