Removed non-future handlers