Remove support for callable