Clean up some unused code paths