Dependency on Sugar removed