Removed/commented out test code