remove methods / add options

Breaking changes.