removing deprecieated code