cleanup fields