Remove usage of the constant 8