Minor cleanup, removed dead code.