Removed old testing bits