Cleaning up bootstrap imports