Removed leftover unused code