More directives; Following Clean up.