XO::Engine overhaul
Remove unnecessary requires