Removed some unused code that snuck in.