Forgot return statements on deprecated functions