Add doc and remove unused directives