security fix
d
removed unsused method
removed unused method
added omit null option