Fully functional implementation of higher half remapping and general cleanup