Moved debug tools to only be used when in debug mode