Remove block_statement_private structure
Change block API