Cleanup/rewrite parts of block model API, remove most block-id related methods. (instance usage is preferred)