[Additional for #52] Updated javadocs and removed one option.