WIP hackjob
Drop unnecessary JS stubs.
Flip order, micro tweaks.