removed some duplicate cleanup