Minor code cleanup
Remove test that is of little use