Remove some Jappix fanciness