Cleared a TODO item from original plugin