Removing unnecessary BV_DEFAULT_SIZE and cleaning