properly stub deprecation warnings
uncessary line removal