removed some options, doku cleanup