Cleanup directive definitions