Removing @deprecated annotations to resolve Issue 4