cleanup and new doc