Removed the test code...again