Clean up some unused names