scope resolved, removed unnecessary code