further cleanup of 1.2