Feature/clean prediction

Created by: zarubaf

I've Linux successfully booting with the cleaned up version on the FPGA. So I don't see much reason to not merge it in this release window.