Non-sleepy endian logic cleanup