Remove bytes_per_sample, replace by existing macro