Cleared unused code for test