We don't need extra 1 byte anymore
Cleanup (refactoring is finish)