Removed old test code for real