more quick cleanup