Removed some unnecessary stuff from basic_block_t