Remove unneeded dependency, style changes.