Merge "Cleaning up imports and dead code."