Remove ONE_xBYTE #defines