Removed old code from pilot days