Remove directives and combined. If re-use is needed, I'll move back to directive