Removing unused directives
Added guardian mode support
Doc parameter update