Removed old/debug code