Remove indexOfEvent and hasEvent which should have been removed with the last commit.