Unnecessary imports removed.
Names unification.