Cleanup, removed dead code.