cleanup; standardize directives, remove unused BEL