Removed a deprecated and now buggy function function