Bionic optimizations clean up

Let's test it

...