Remove Bubblewrap requirement. Refactor