Some further cleanup