Changed the way timeouts are handled
Delete TaskExtensions