Merge changes from r196. Removed an unused import and dependency