un deperacted methods which shouldn't be depcreated
Remove unneeded depercation and some code clean up