Remove unused ctag-related lines and add new bundles