Removed Deprecated variable and Functions