[#47] all respond to blocks and unneeded methods removed