removed unnecessary blocks