Bundle cleanup