Cleaned up some USE flags and added a comment about possible vestigial code.