Upgrading to 2.x
removing old elements path