Clean up some leftover crud