Fixes #28 - Drop options.handlers