Support bacon
Tidy up imports that are not required