Changes in design (removing, changing order) and removal of unnecesary imports