Clean up implementation of custom bundle covers